From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 30 Aug 2006 22:54:55 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~42175
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=df31405a9a240e8ea882953ea90736ff57b47643;p=linux-4.9.git

Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SUNLANCE]: Fix probing problem.
  [SPARC64]: Fix X server hangs due to large pages.
---

df31405a9a240e8ea882953ea90736ff57b47643